Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 22 Jan 2010 14:50:35 +0000 (14:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 22 Jan 2010 14:50:35 +0000 (14:50 +0000)
commit22a6886074b9939919824c2a5b27f1a1aabb25c0
treef28cda78b033a3aae856ec83093dfef830d3ded7
parent7cd6efba45b781d4d6e6851d7930dcab30481e58
parentff3b5cdcf7863cf9f47aa3e01f952037df1089ca
Merge from mainline.